From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Mon, 26 Nov 2012 19:21:03 +0000 (-0500)
Subject: extensionSystem: Don't spam the error log with OUT_OF_DATE errors
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5367
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ca73017100c6e94b937564fa60c1e42ab038c22b;p=gnome-shell.git

extensionSystem: Don't spam the error log with OUT_OF_DATE errors

Nobody cares

https://bugzilla.gnome.org/show_bug.cgi?id=689108
---

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 4512fdad6..62775a3b7 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -126,11 +126,7 @@ function logExtensionError(uuid, error) {
 
     let message = '' + error;
 
-    if (error.state)
-        extension.state = error.state;
-    else
-        extension.state = ExtensionState.ERROR;
-
+    extension.state = ExtensionState.ERROR;
     if (!extension.errors)
         extension.errors = [];
 
@@ -145,18 +141,16 @@ function loadExtension(extension) {
     extension.state = ExtensionState.ERROR;
 
     if (ExtensionUtils.isOutOfDate(extension)) {
-        let error = new Error('extension is not compatible with current GNOME Shell and/or GJS version');
-        error.state = ExtensionState.OUT_OF_DATE;
-        throw error;
-    }
-
-    let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
-    if (enabled) {
-        initExtension(extension.uuid);
-        if (extension.state == ExtensionState.DISABLED)
-            enableExtension(extension.uuid);
+        extension.state = ExtensionState.OUT_OF_DATE;
     } else {
-        extension.state = ExtensionState.INITIALIZED;
+        let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
+        if (enabled) {
+            initExtension(extension.uuid);
+            if (extension.state == ExtensionState.DISABLED)
+                enableExtension(extension.uuid);
+        } else {
+            extension.state = ExtensionState.INITIALIZED;
+        }
     }
 
     _signals.emit('extension-state-changed', extension);